Merge changes Ia7953e3c,Id1f29f4d,I38623130 am: f29cd20df5

Change-Id: Ide7fdcfd5b6060aec893991ed68a3ce95b75cf17