Updated from global requirements

Change-Id: I458a1e0540b520e855ccd689d77ab6c522b97e36