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

Change-Id: Iaec7c94d535cbd77ab1a01f11da03eef510d9aeb