Merge changes I24e1b1b4,I4e951366
am: 4af5bf57c2

Change-Id: Ib9355354ffd6bd9a131797d6bfe511288a88d057