Updated from global requirements

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