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

Change-Id: I53cd2369f2f0c2f182ea7768284dfe15d2db98f6