Updated from global requirements

Change-Id: I51c791c1fb84451b2cefa264873e3b9f7bc78059
Merge "Updated from global requirements"