Updated from global requirements

Change-Id: Ic83c10204c0b63faa3c131067ffe5b87faf9a7a1