Updated from global requirements

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