Merge "Improve thread safety of ManagedServices.java" into tm-qpr-dev