Cumulative patch from commit 06f14421ea8644d12a7b0be6b583114869f9c451 (DO NOT MERGE)
am: 55840adb6c  -s ours

* commit '55840adb6cd32ca52064f327b72a40e769f70661':
  Cumulative patch from commit 06f14421ea8644d12a7b0be6b583114869f9c451 (DO NOT MERGE)