Updated from global requirements

Change-Id: Ib2641686f93cd1e8e3dfd333654e718a9a6c4906