Merge changes Ic0d4d9cc,I1fd9b45a,I454c0436
am: 392a0098fc

Change-Id: Ie4005bf6bddfbc57ec9a1495fb29a905b8c20bb2