Updated from global requirements

Change-Id: I2d0a1d3e99a68e09c58b177f00bbc08bd8b758f7