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

Change-Id: Ibb48d4d4fbae50a977be353476c61771150ae2fa