Updated from global requirements

Change-Id: I702000f6acc16e128d3ea2420e191b2384cfc2a2