Remove some pre-1.20 compatibility

Change-Id: I0562a8c0f6cef0772ca05f47f893006663975a1e
Merge "Remove some pre-1.20 compatibility"