Updated from global requirements

Change-Id: I8dac827696322e5936aca093209c294fd6c03837