am 6fb1677d: Merge changes I221533ec,I5a8d2ed2 into studio-1.3-dev automerge: 26d0c75 automerge: 815c49f

* commit '6fb1677deb80047a1736acd3432fc87be0832b75':
  Refactor most application tasks to use CollectionBuilder<Task>
  Refactor a number to tasks to use AndroidTaskRegistry.