Updated from global requirements

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