Updated from global requirements

Change-Id: If2fac7db6c929e9695aee81794eb15ab7053711d