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

Change-Id: I5c64ef1ea0af0f5671ef977eec6d0e1e57960551