Updated from global requirements

Change-Id: I2232c0c00179dd604dbe789b72ce721ded7c5622