Updated from global requirements

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