Updated from global requirements

Change-Id: If9434ed98d94d5a266f872239c04f1828f3d39ba