Updated from global requirements

Change-Id: I1aca0da594de16837d8cb031074e59307dbf34b2