Updated from global requirements

Change-Id: I0d9cb1fe4fe1d0b991356e12ed62b101a3e2b0a8
Merge "Updated from global requirements"