Update defpatch forms for 8.2 and 9.0

Change-Id: I443301376e9dfc36112de9b230b0fc54b0790547