Making 1.22 Work for Fundraising Shtuff

Change-Id: I865eeea85b36f1edb025543acf33d9278d047d89