Merge "Encrypt inplace settings." into honeycomb