Updated from global requirements

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