Updated from global requirements

Change-Id: I5360833c54a1977604bce1bad9ce8444e3110168