Merge changes Ic92b6d5c,I98b23b22,I0fb40d7b am: 9c57accc45
am: 166413798d

Change-Id: I4203dc39e2f141c864949adb58a96fcca480a369