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

Change-Id: I778c99c29db7550f704e7b0440e7b2085908a91c