Updated from global requirements

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