Merge "Fix access checks for app compatibility."