Updated from global requirements

Change-Id: Ib5d842e2f456536ca8d62a2bf744f0d54456a1b1