More updates for 1.19 removal and 1.22 addition

Change-Id: If00e7bbf303796343fc0a5cf2bdc15f086109064