Updated from global requirements

Change-Id: Ied64e5bc4151da6a54ad7d6e5717a2fa6f755fec