Updated from global requirements

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