Updated from global requirements

Change-Id: I13af909b88bd18121617871a0847347e6e2c64cc