Updated from global requirements

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