Merge "Recovery 64-bit compile issues"