Merge changes I9ab50a7a,I8a57b632 am: 37434b495f
am: 7646e21789

Change-Id: Ia7befef55f9cd1f3bc24c68d113c62ba3828fe4e