Merge changes If2b3b414,I1039748d,Ib3cd38f5
am: 003eee49d4

Change-Id: Iecf59cdfeb765af3a14a68d31e6bd113ad0e02a7