Updated from global requirements

Change-Id: I17ea04ae357aa532352b5f93eca7ba57d6cd3197