Merge changes Ib69a206f,If57cc175 am: 56e89ade33
am: c0a62dda08

Change-Id: I53ea78a0035d402536dd86079f89b86f39fce21a