Merge "Unifying multiple all-apps implementations" into tm-qpr-dev