Updated from global requirements

Change-Id: I849d5e6ada9172e5982b8140a7ee47c1ce7af3cb