Updated from global requirements

Change-Id: I2ea5a72a89ed65144259551059381ee6d0b12092