Merge 9c23274200429060de7b85a4279366b5130f4994 on remote branch

Change-Id: I3c85bf43c6d1184ded665a198abec7c6eca05d09