Updated from global requirements

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