Conditionally disable uncrypt

Second part of this commit is on fwb

Change-Id: I05d9bc968359450c180b17d8f5d44087b8d29eb2
2 files changed