Updated from global requirements

Change-Id: I8e079a649487eec931d61a80be8ac2c23889371d