Updated from global requirements

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