Updated from global requirements

Change-Id: I4716bc17dd898ecf25f730641fc6901ade0da7eb