Updated from global requirements

Change-Id: Ida3d96383c54ff6b16297f5bfc46804dc954bc59