Updated from global requirements

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