Merge 3ce7e33dd109409df3972a4e9e0117b84c2286de on remote branch

Change-Id: I492b45c8fb786062024d8a2a0cddb3573946af1a