Updated from global requirements

Change-Id: I2058e36d2800a6510e229128539744d8fe6f544b