Updated from global requirements

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