Merge proposals dependent on lp://qastaging/~agustinhenze/cdpedia/android

lp://qastaging/~agustinhenze/cdpedia/android has no merge proposals.