Updated from global requirements

Change-Id: Icb2526c2b9f300430b1a2b84189a0a3646bca627