Merge ca80f817c578d5889cc846a1355a7bf6acc0ba24 on remote branch

Change-Id: Iaac3012ed349106049bd4782a919fe62288fae68