Merge changes Iec0be1c3,Iaa2a7653 am: a483aad3aa am: e274f7a9a4
am: fd488d7f92

Change-Id: I9ade8c967513e9b4cc91f1fc634badfc4f50ad78