am 702634a4: refactoring in preparation for bug:6498869 fix

* commit '702634a4dad85cfc292618ac91eda6c00f42b7c5':
  refactoring in preparation for bug:6498869 fix