Updated from global requirements

Change-Id: Ie4f326237f51eb4e57cc90a0af73709a8f5d26f4