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

Change-Id: I11e035751b87cfa20b223bd4de818a7d5521e412