Merge 3710d31b32f5814403499f695e453c3192567278 on remote branch

Change-Id: Ice4a3d7ef3023449079adefbff4e56c0727ec73f