Merge changes from topics "createapexdirs", "createapexrollbackdirs"
am: 06126e1b6e

Change-Id: I602e76198932d4afbb46ceb28fb70c3377e545ac