Merge changes Ia0ca36fc,Ib42c0635 am: 1abc3cd641
am: 695e6182d3

Change-Id: Ib3ef2009d60445b1c3e1eb46a44471236df89fa7