Updated from global requirements

Change-Id: I3a99ca47662b8590c78d89faf6345ebff6fd771d