Updated from global requirements

Change-Id: I13aa43b356d74b88d94ccac3ea67457204c330b4