Merge changes from topic "am-ae65f3ef-6d07-4e27-87c0-96669f2d95fd" into ub-launcher3-master

* changes:
  [automerger] Refactor "spring" code into one method. am: b83c71aa24
  Refactor "spring" code into one method.