Updated from global requirements

Change-Id: Ib99e024114239ae8abecf1425028aaf61a1ad704