Updated from global requirements

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