Updated from global requirements

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