Updated from global requirements

Change-Id: I610f5500f18896cc8c4947d13d5a7a973d4a6ae5