Updated from global requirements

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