Updated from global requirements

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