Updated from global requirements

Change-Id: Ia08d40173ce0f4ab69975a269f5946f37b47c1c0