Updated from global requirements

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