Updated from global requirements

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