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

Change-Id: Id565d8fa14cf31499870fbec681a09d4f12c98f6