Updated from global requirements

Change-Id: Iaa547b37284e839807f5472fc61712090df89c80