Updated from global requirements

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