Updated from global requirements

Change-Id: Ib274144814a17153c247257db357e9290aa60370