Merge changes Ia8f83a53,Ia1f6a659 am: 68f2e9cf1b am: b71ac7f83c am: 8593621b2d

Change-Id: I282326f1ff6158f60d4195a51ad2abdba382d483