Updated from global requirements

Change-Id: If908007e999cb3394136d1980267e4cb7c427966