Updated from global requirements

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