Updated from global requirements

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