Updated from global requirements

Change-Id: Ie4526565d9f0e3f93beeced5e1536f2c1d6729a0