am 45634bf8: Merge "Moving methods which update internal sets on a separate...
am 45634bf8: Merge "Moving methods which update internal sets on a separate thread" into ub-now-queens
* commit '45634bf8':
Moving methods which update internal sets on a separate thread