Merge changes Ie70d0155,I0692a91d,I8c5041a4
am: 4507201da5

Change-Id: Iaeb7c0e3b6a7ed63518de98a11df165b753fcb6e