Updated from global requirements

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