Updated from global requirements

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