Merge changes I8c58d6bd,I0a19fd87
am: 291fd678e5

Change-Id: I61b519494c1b78de65ae37e0e43bb44ae6a95160