Merge "Remove hacks to access framework private resources"