Updated from global requirements

Change-Id: Ied3a112db624826bd0e80a909da85bc832510dc3