Merge "Editing encryption strings." into honeycomb