Update defpatch for 8.2 and 9.0

Change-Id: I40e36f428194f3a12e3c2e41caf6fcaba2f051f9