Updated from global requirements

Change-Id: I389f6b19b1fb7a5eb10268070e171dc4b224fef1