Updated from global requirements

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