Merge 6f6c5d8dbb5ad7eabda12f43c7a8103fdf2f4f1e on remote branch

Change-Id: I2f09e8cf9a27007b058b30c37b107cdfbbdd4bde