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

Change-Id: I426158070c04bf89239a24314b99bda4a166fc4d