Merge changes Ia7953e3c,Id1f29f4d,I38623130 am: f29cd20df5 am: e288260524

Change-Id: I6b5526a3e9ae841254f5fde00b82da1790881562