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

Change-Id: I0449b247a10115c7f5a24f12e8f79c9c67223311