Merge changes Id513b72a,I92cd0116,I62393b58,I90ac2224,I527f88ac
am: 572791e027

Change-Id: Ide3f10bab5d5789c0482cd55db974559c7f00366