Updated from global requirements

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