Merge changes Ic85892b4,I627e47c6 am: d995c94426
am: d49df21f80

Change-Id: Ia916b1a329769a22bf3831dec03c753018c2e24c