Updated from global requirements

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