Updated from global requirements

Change-Id: I8f6fd8efdb90b3c122312ff1b261da882c51b674