Updated from global requirements

Change-Id: I3897837748e4fbcd23128b235079f8e73400a56d