Merge 4dcfb44725446eea65b4d43af8c899ab418dfed6 on remote branch

Change-Id: I5d635ee38beffed9d00e7c578b99f4497c056abc