Merge af9ab6d366e8bd35289cc4588d3095a3fd6476f3 on remote branch

Change-Id: I838849dbbbafa3556bccc01f5e017c92dc181586