Merge changes I8c5ab552,If8546dea am: 3a8001476d am: a2338809fa

Change-Id: Id2448a5f3920d999922b1e9dd3c7d2f4247da683