Merge proposals dependent on lp://qastaging/~zyga/checkbox/tpm-hacking-patches

lp://qastaging/~zyga/checkbox/tpm-hacking-patches has no merge proposals.