Merge changes Iec0be1c3,Iaa2a7653
am: a483aad3aa

Change-Id: I3faf3a33892552589aa0d53b802b24d6ac15e386