Merge "Fix location of StorageEscalation test apps"