Merge changes I5cf0d014,Ib46f0646 am: 609630e7ba

Change-Id: I66754d24b58cde35284b4e0b0621e3f40b587948