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

* commit 'c7c8334f059e42106c7cfa27cdead277fd5e135d':
  refactoring in preparation for bug:6498869 fix