Updated from global requirements

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