Merge changes I3b20be28,I7118025c am: 3de710f84f

Change-Id: Iba41f236bdfd7b37c60c61b658f2d3122c504217