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

Change-Id: I1ef92a21e310a92310af1127de32945b8ba3e82d