am 116d81ae: am 07dcb12e: Merge changes If22008be,Id0049ce6

* commit '116d81ae27514b5d3d7517bfee47d164ed7e1ef6':
  Make encryption configurable
  Provide a way to select force encryption from vendor partition