Updated from global requirements

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