Updated from global requirements

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