Updated from global requirements

Change-Id: Ic9cb1e13504494c82fcc5f1eb84ee6ad0091cd20