Merge changes I3978cbe2,I7b8e1232 am: b07cc5e0c0
am: c684fbeac3

Change-Id: Id9a64870be6d75538eb8bc1f2ef7c53fb744717b