Merge changes I38c76bb2,I81a55e92
am: 3aaca7dd60

Change-Id: I97c472d0c9f351606651bca5920ba990b0cb48a4