Updated from global requirements

Change-Id: I2a306dd8edc030d3f989e9947dec784f502b3953