Merge "Actually apply version script"
am: ef5dcaad15

Change-Id: I6179359409472ed5d6e3e927f4322cddfea92847