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

Change-Id: Idb332dd0b729b5394ff06ae611349b674b2e7f2c