Updated from global requirements

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