Updated from global requirements

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