Merge changes If22008be,Id0049ce6

* changes:
  Make encryption configurable
  Provide a way to select force encryption from vendor partition