Updated from global requirements

Change-Id: I09acde6af1c49862ed456db9b75e064ef354494e