Merge commit 'd3896c106d6a6e4d461be658a9e66efbde31f28d' into nyc-dev-plus-aosp
am: e758b2b3d3

Change-Id: Idd9d6f307b0f905085615bd651927c6c4472a886