Merge "Improvements to enable encryption steps" into honeycomb