Merge changes from topic 'am-77f1c064e37e4a04b3ba081a7c5bc7db' into nyc-mr1-dev-plus-aosp
am: 8b27699fff

Change-Id: I6329497c357fa35bc0814d9053b82fc880129748