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

Change-Id: I2dca6891828a3b28bc1ba06787ad3e7d6169650e