Make file encryption type available am: 4e898a01fd
am: 7c198d3eef

* commit '7c198d3eef7db3b87d8d299a56bc98f9082cf649':
  Make file encryption type available

Change-Id: I48a64f008de85664a02ce92bf1103340a3edd2c0