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