Updated from global requirements

Change-Id: I2b04948fa4560ee5735be99421982e999ab1bb14