Merge changes Icd56662d,I0ece820f am: 47ef64b0d2
am: bf66580c0b

Change-Id: I5faf7049c376eb400a41231448d9414471ae6777