Merge changes I1bbf480c,Icf2059cc am: 701a99834f

Change-Id: I958b327f69f52cebf0e54e99b3c174ae30bce455