Merge changes from topic 'am-1b0390d7a24849e3956bb6a993789c51' into nyc-mr1-dev-plus-aosp am: 688f88786d
am: 0814949a52

Change-Id: Ie55ca2a866d78b192e68e1c9b7d44c81cedfc134