Merge "Make encryption action an argument to mkdir" am: 449282c021 am: e9fa41b0dd
am: 82eb4f61cf

Change-Id: I76ae4cc55d6b56928d7007bc6f199e1c411fe23a