Updated from global requirements

Change-Id: If78e9c6525d1c1e07c99d94a297f0e201d70bc38