Updated from global requirements

Change-Id: Ifc1ee82a8be88b153bf32f33d9eba4c229b01a1d