Merge changes I00772405,Id9a6c59d am: 6afea5ae88
am: 5a345c0c33

Change-Id: Ic15b37d8c003588d0617b00e2b6e5be233aada08