Updated from global requirements

Change-Id: Id380d4d5fbb606728ec7ffbc34801958b0721a33