Merge changes Idbde7000,Idde3c9d0 into nyc-mr2-dev-plus-aosp
am: 767b7ad7dc

Change-Id: I3d5a6c31629a5756e0ea97c9a66a19cc702bc5c6