Updated from global requirements

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