Updated from global requirements

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