Merge changes I3978cbe2,I7b8e1232
am: b07cc5e0c0

Change-Id: Ifd8eca62e9496eac9121e17f0e36629975d51ebe