Merge changes I63b5e69b,I85c6af63 am: a800e1ee9d am: e37779bfea

Change-Id: Icd8185c3dde915a3fc2422277504965944e1ea94