Merge "Fixed leak of app token in exiting list." into oc-dev
am: 781ad9f202

Change-Id: I0ce62bb39852d2107a84f6d3bc290b7dd4115456