Merge b7fd2c934b56366447c0ccd886f305ff55c4f841 on remote branch

Change-Id: I7faa7b59e9e99244e862537b75ae81284e4958a3