Updated from global requirements

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