Merge "Rewrite compatibility checking in unit test." am: 78315db070 am: d9a321cc7a
am: 85dd8be63a

Change-Id: I2c0aead1268812e35917b4fa43cc1433900a8391