Updated from global requirements

Change-Id: I69d69ae9153769414d76b63ccb59fdd8ff06d01b