Merge changes I1bdeffc6,I3e13db97 am: 568220e911
am: 931d82739b

Change-Id: Icf7e155a6d41e8a09c2347a935882e90778013aa