Merge 80b0c342ff182f64d5119ee7552e60c3f619d7ba on remote branch

Change-Id: Ib23963ed7aa4b1e2ab18ba11eddebf141dd492f8