Updated from global requirements

Change-Id: I2496cedfb28040d9df1af0fc5a11b382b9850ca3