Updated from global requirements

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