Merge changes Ic85892b4,I627e47c6 am: d995c94426 am: d49df21f80
am: 82160ca083

Change-Id: I44ec8e564dee2548695842871336ceb885c214b1