Merge changes I5fe02059,Iea8bf298,I0630c302,Ifc4b8fe9,I29319bda
am: d888e343b7

Change-Id: I312a8cc960d967f246f53e3e5677ab7008934951