Updated from global requirements

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