resolve merge conflicts of 4acdde9 to nyc-mr1-dev-plus-aosp
am: 704fe2d628

Change-Id: Ib71a0d4192273e6dac1359895619a73632b817d2