Updated from global requirements

Change-Id: I1c01f4641c2f918310162144284aa68d57408bf5