Merge changes I7c1c0f3d,I670cb0b7,Id426d5c5 am: ce7ee088ff
am: 8294bbf2d0

Change-Id: I3730c43e182704edb77cddbd5ea4c6a3fdd95f7c