Add newly released (remaining) 4.2.2_r1 tags

Change-Id: I0308d129cdd67dc630e3c642b70280073d21983c