Updated from global requirements

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