Merge 91d7a050881b1df204a889061a7f10ca924b3a67 on remote branch

Change-Id: I18768864c33955d0e123850620f6bc7cb2039de6