Updated from global requirements

Change-Id: I80d8e794d443a34be1c8b3da8eef222c0948cca8