Merge c18f5008cd129d23a71296e4cb1c045fe0371941 on remote branch

Change-Id: I3963a6144985a8d764a152089aa892d81b70ea2c