Merge 5ddfed48f9f111f4064035533eca2ea919e1867b on remote branch

Change-Id: Iac50ad7ac94fb1d7b74f649946448de561d60341