Merge changes from topic 'am-9d6b195743714d6486aa5f3d40a80546' into nyc-mr1-dev-plus-aosp
am: 720fe39c3c

Change-Id: Ie5ffdab1ff46d9aaa52cc616fd38c86f16d59f94