Updated from global requirements

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