Merge changes Icd56662d,I0ece820f
am: 47ef64b0d2

Change-Id: Ifd2ffe68cfff511d010ce5e755b4b680ad1df52c