Merge changes Ieaecb4a9,I04f46f86,I61d0e3f3 into nyc-dev-plus-aosp am: bb0e12b4e0 am: 0f76016a30 Change-Id: Ie8166834e3a3ee910def65e27a6e3d311271a04a