Updated from global requirements

Change-Id: I74ce0e9139ebdb7133f1f80accde14f9f92504c5