Updated from global requirements

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