Merge "Unhide further 1.7-era APIs"