Updated from global requirements

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