Merge changes I92cac83b,Ie897c40b
am: 4278f71118

Change-Id: I7cdd5f23e6b654b37f0c03e5d2ce05d2753646ad