Change-Id: I9f199d4f5843fbba374ced8206902098811b3786
Change-Id: Iadd68cbd429af4d431dcd09b9adacd09c5092ae6
Merge app entries together some. Also a little weekend present for swetland. Change-Id: Ie2b6654d9de0b9eeaafbf4b070845353c130b9c1