Updated from global requirements

Change-Id: Iec5cac6baeba71e6724fd6270f3d5dd87f1e730d