Merge changes I457a6659,Ice835d9e,If361adb9 am: f5c48f51cf
am: d24dc8692f

Change-Id: I81bbcc87c1c60499305a9940fcf737d860bb9f54