Merge changes Iea1d2ae2,I1d3c8e48 am: d708ea7b4a
am: ebde74e7b1

Change-Id: I13d0bebcee21345b628906d65ea46c0798901663