Merge changes I457a6659,Ice835d9e,If361adb9
am: f5c48f51cf

Change-Id: Ic8c88b4d371498319ee55fdfe21a9a3d84a65762