Merge proposals dependent on lp://qastaging/~om26er/camera-app/fix_autopilot_test_code

lp://qastaging/~om26er/camera-app/fix_autopilot_test_code has no merge proposals.