Updated from global requirements

Change-Id: I82180e7608abeac1ebd0ceb04254ec94bf8f152a