Updated from global requirements

Change-Id: I3e35b1e007e3383512f72e5d059b1e345ecdc244