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

Change-Id: I1686bec34d1f7fe407e71a486c70a2dc90660712