Updated from global requirements

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