Updated from global requirements

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