Merge "Add internal plumbing to DPM for encryption" into honeycomb