Updated from global requirements

Change-Id: I4b438108b5e79a24d5e57e6c2a1a268f167123f8