Updated from global requirements

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