Remove activity leak. am: 793cef95a9
am: a9d23adc78

Change-Id: Ifd29f211313ce034f63113b1f442ca5f17342a7d