Merge "Add encryption to SecurityPolicy" into honeycomb