Updated from global requirements

Change-Id: Ie301346cda80246edf6516a83ff6618613011eaa