Updated from global requirements

Change-Id: I982863a35c5056ea652f043e1856786acb5504c5