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

Change-Id: I4a37d9951178fce666fb11b407a33aeda86757bc