Updated from global requirements

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