Merge "Bring along more ApplicationInfo fields." into lmp-dev