Remove activity leak.
am: 793cef95a9

Change-Id: Ib69bbb7cc38c408e5524bd7e8e18e7d5a7d43986