Merge changes from topic 'am-15128313c71649e3bd36a27ab8405fce' into nyc-mr1-dev-plus-aosp
am: 75c6b50055

Change-Id: Idf7c59a8f7766d5b467dc8aa0b9ce40be117864d