Merge changes from topic 'am-c0ec5f28a7be4becb812fcd1d98e341c' into nyc-mr2-dev-plus-aosp
am: 735bb46ff5

Change-Id: I20d6ccd78e04797690030acb7ef0d6b41fa6b08f