Merge "revamp app compat test harness" into oc-mr1-dev