more ephemeral_app cleanup am: d5b6043f51 am: cb7a9c1d10 am: 509a008f2f
am: 778ec33a1d

Change-Id: Icf0d8956d8eeb78ca48f37d4200d2206dd2b9e14