Merge 43df8e3cf4c766ad801a3151da940c2700590a50 on remote branch

Change-Id: Ia418c75be04532d868bdd87d2109b7bbc60eb653