Merge 17080a4e0c49bf8ac354113f2974b866d6a24bd0 on remote branch

Change-Id: I3868ae76e134d08f61096f01862e0cd690516ad0