Merge 6fdb1fc71c3a1e98252fadd7d5e179dacf57bac1 on remote branch

Change-Id: I61d21d10810bbc8feaf9bb1277842efa38ffdaf7