Updated from global requirements

Change-Id: Ieafe119fe7df2567794c1c85c270c8236fb623b1