Merge "Remove activity leak." into arc-apps
am: f7746f6453

Change-Id: I3c3dc11ff0d5bc0ad0ba0b00ff716d388856517d