Deal with problematic new test cases for CompactAPI (2) Change-Id: I343688d75f31b06881a7e9684e349bf23c5b0c9a