CompatibilityMatrix::combine() combines everything correctly am: e7837b164c
am: dd4789a548

Change-Id: I6874463e29a07263b2e428a0c7b39fe0316918b7