am 7815c8bd: (-s ours) am 3282fa98: (-s ours) am bd6a6e60: Use package CompatibilityInfo as default. DO NOT MERGE

* commit '7815c8bd17b85010c7203f2575bce30079c70a49':