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

Change-Id: I240a2ae5d97e275d3660a7a2d5e9f2e5e222e813