Updated from global requirements

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