Merge "logcat: apct test failures"