Updated from global requirements

Change-Id: Ifc3b21982b35ee6deac637cd438c5e31b0c9cacf