Updated from global requirements

Change-Id: Ife7ba7cb98f36fdb452454ff13831900918bc939