Merge "Don't depend directly on AppplicationInfo" into nyc-dev