Updated from global requirements

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