Merge "Give x permission on apex data directories." am: d6289bdf13 am: f29bb3a0ce am: 28b5b677a5

Change-Id: Ibf077ac2d9fe1b40c3549db7bc2009820b0ea14d