Updated from global requirements

Change-Id: Idb844ccaced77eecc086727cced8ca040c7a0c62