Updated from global requirements

Change-Id: I0271e5b25934ade786852125b33f13a2b548c3f2