Merge changes I627e47c6,Ic85892b4 into nyc-mr1-dev-plus-aosp am: 85a19e86d0
am: bac0d87926

Change-Id: I6b2e0cf609bed4e046b37a00d52665a8aece12a6