Updated from global requirements

Change-Id: I48f80295f557dde6d75f4477159dcd951e6ddc8b