Updated from global requirements

Change-Id: I2c7aa417a76d52c380f1d8e42ff297e7bd66d5df