Merge 3947d977d7969ea01d208355e4205a42e39003a8 on remote branch

Change-Id: I6ebc0973cf7912578e0f2c675639558011ec31f6