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

Change-Id: I5f319c11f17073feb967eb7be0d523d757afdbdd