Merge "Remove /data/apex/hashtree directory" into main