Updated from global requirements

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