Updated from global requirements

Change-Id: I728c51e3f7481efc014f67c46f6e7fc59e395d82