Updated from global requirements

Change-Id: I2b83e3dedd23bfa1e4cc6034e7d823b4ee11ac9f