Updated from global requirements

Change-Id: I08cb60f8941f4321fa00420ac8c6b83662525876