Merge changes I0ff1fc5c,I7a23d3bf am: 7d199de8e2
am: 162ec283cf

Change-Id: I1dc9b13c00f6944368257e9a4e347278ec46f55f