am 127ab1fc: resolved conflicts for merge of 158e11d6 to mnc-dev-plus-aosp

* commit '127ab1fc2d6eab382d4464bc1b5b6cbd30bbc6d1':
  Separate uncrypt into two modes