am 6d78dd8e: Merge change 4147 into donut

Merge commit '6d78dd8ef833e22d73fc65df205346e657cf9850'

* commit '6d78dd8ef833e22d73fc65df205346e657cf9850':
  On the way of refactoring out SingleServerProfile.java.