Merge 0498677db2716e6e918f9bed68af7c4de51223d9 on remote branch

Change-Id: Ic40252d524e077eaf792beda2cd4ad47790bd752