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

Change-Id: I9f1cf0faad50f375bc7b7b076a33c338a9fffcba