Merge proposals dependent on lp://qastaging/~milo/linaro-android-frontend/bug1191013

lp://qastaging/~milo/linaro-android-frontend/bug1191013 has no merge proposals.