Merge changes from topic 'am-72bbc108e9a84456ab88db3270cbb4e9' into nyc-mr2-dev-plus-aosp
am: 7dfd0b9843

Change-Id: I8a7ab11326864e25a993c4e4daecc3c280adf1a2