Updated from global requirements

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