Merge changes Ic355174a,I8b04ba9e,I3fefb13c am: dd67435bac
am: 29745f29b8

Change-Id: I31e6b092149c3fabe7715277a43e611f3f96648e