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

Change-Id: I64684eac5ffe403e5c337a1041128fe7aab76c26