Updated from global requirements

Change-Id: Ia8f8d2c74cb097c0e279f629d2d0a1b3b78442d2