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

Change-Id: I26ce480e60fdd8ea5e0e353f89ab025a11c3e0ed