Merge "Remove the APIs for the old encryption scheme." into honeycomb