Updated from global requirements

Change-Id: I3c2bf6087cf07cddb4b1290470d5180edbbec42f