Merge "Support for unbundled app build"