Merge "Update encryption commands." into honeycomb