Updated from global requirements

Change-Id: I2da7f761a0582e8d2be7aaaf0ca55d119f800fbc