Merge 4ece6c90b536d0095a00cc04fdf554bae952cdda on remote branch

Change-Id: I54f60c4280e8eb0eb14fd3b31db04aab04c8a95c