Updated from global requirements

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