Updated from global requirements

Change-Id: I5f6a996c9fd84c5b1d767ff6a55c52757604ed97