Updated from global requirements

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