Updated from global requirements

Change-Id: I2d707bc4bebf87bf9da802d3a682109ba8097a9e