Merge changes I8c5ab552,If8546dea am: 3a8001476d
am: 4b02b9bb96

Change-Id: Icccd4f66449d70005d74ffdec08cd6fbf0dbf9f8