Updated from global requirements

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