Merge \"Don\'t depend directly on AppplicationInfo\" into nyc-dev
am: 55cf361d83

Change-Id: If30e7300c84a79871dc8a0288f8402ed49e4a662