Merge 6f6c5d8dbb5ad7eabda12f43c7a8103fdf2f4f1e on remote branch

Change-Id: I161098bcb745411bc6ee3cfe916fd151d4066eba