Merge changes Ie10042ca,Ic5203951 am: d519d9c79f am: a9bc7ee4ed am: c1927afefc
am: 87b11b0240

Change-Id: I9f9d413e76493a55a0ea52bea1548273d8c6470c