Merge changes I8804f7dd,I3cbca589 am: 0e9a0f9831
am: 861f7157de

Change-Id: Icf98f05f69eaab1ffb4f320d8c1f88831c4e34a2