Updated from global requirements

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