Updated from global requirements

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