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

Change-Id: Idb6c75f8f4dac1bba95ceaee3139a27c2bd16ce8