Updated from global requirements

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