Merge "Revert "CHOOSER_UNBUNDLED -> droidfood"" into tm-qpr-dev