Updated from global requirements

Change-Id: I60e217d361a71b2c7518aff98b5530e689d838c5