Updated from global requirements

Change-Id: I2ec6c134fcd9acee6a6790d9dfb5f6b12664fa8b