Merge changes I24e1b1b4,I4e951366 am: 4af5bf57c2
am: d81e04e310

Change-Id: I30b5c603a66ca47de62f178514e09793ea358027