Updated from global requirements

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