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

Change-Id: Ifa6da270588a000b95094bc86ac01205730486ce