Merge changes I8b8df509,I856f01f0 am: 5fcfe7cc4f am: 2d156f4deb

Change-Id: If280205257c6d8d6b0630c483ff307ee39e3ece7