Updated from global requirements

Change-Id: Ieb3d8ef20f22f68f954864a42e311b90b9bd556a