Updated from global requirements

Change-Id: I6c402e891f846c7ae7ff8a807ecc1d2cf4b0f7ba