Merge changes Ib5dc7f29,I5b64d435 am: 857135005b
am: 20936dcefb

Change-Id: I0077407bcaa4a5399181583afe12a8c99dd395a6