Merge changes I63b5e69b,I85c6af63 am: a800e1ee9d

Change-Id: I6e4bb6f4255bcd11d8ab5528d62360ed7dfd6b5c