Updated from global requirements

Change-Id: I2556a37a24ef920d84baa5150f187b86a8b806ea