Merge f8ed6999ae561a0780890a43bb933b15230b44ca on remote branch

Change-Id: Id6fb8ae096d6a5eda6f7d567938b3181b12a8ff4