Updated from global requirements

Change-Id: Ib82a2ef4b92dc3ee01fe686b2ed7c2e8d0adb4ba