Updated from global requirements

Change-Id: I5d28190e7687d331b6c01cc66adc9f4793178c96