Updated from global requirements

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