Merge "Update columns and AndroidManifest for SPA search"