Merge 1dfe362a3519eef7b9876e382694575972aa3bc4 on remote branch

Change-Id: Icf768feef2cf8ab07aebddcff50ace493a630337