Merge "Actually apply version script" am: ef5dcaad15 am: f305711ae5
am: 5acfb78d45

Change-Id: I726a4cde960d22c90ddefeb0add5c686b35ced1f