Merge "Clean up after RTT operations finished. (1/2)" into oc-dev
am: 1c6cb69c37

Change-Id: I9aa375f1950c6749e9c855a9edb50d6314249c07