Merge changes Iad120cef,I1f819c51,Ia87e5a80,I95e92c08
am: 10dd0c05bc

Change-Id: I48e0ec3523396b0da2aaa807749f656c79f7ae0b