Updated from global requirements

Change-Id: I2572892bed0e9f568838babb8ad82e8185afc154