Updated from global requirements

Change-Id: Iadf6adbc667f957b72ded277e8dbd999c1cf393b