Merge changes I7f697d1d,I60f47a48
am: 6c10141800

Change-Id: I73f47d0fd1499142fb6651010c5f0e95cbadcb37