Updated from global requirements

Change-Id: I9d6c88650b1f29b81aabdf1a75ab6aba15248bc2