Merge changes Ic0d4d9cc,I1fd9b45a,I454c0436 am: 392a0098fc am: 3ea82a304b
am: b68fb45d5d

Change-Id: I70ac75655d68a70a707745896248f543e5ad4b23