Merge b38006530e2889d4fc768778838398288d6e8519 on remote branch

Change-Id: I6f12efbfce688d074f91676a0eb531edd63bed4f