Merge 969084d15562dd8e3efa2da3a576c4cba4c8e505 on remote branch

Change-Id: I2f7b9627149f7d3425b974f9674f0e8b31cd3cba