Merge changes Ic6e79b83,I4135ff1c am: 417a8e2376
am: b876d63a16

Change-Id: Iba2182b5f33f1c9d489a5474177696d49e9e62a0