am cc448e10: am 7ad2d5b4: Merge "Correctly populate title for ResolverActivity" into lmp-dev

* commit 'cc448e102bae06bcd2f9d1d1e59013f531f09a3e':
  Correctly populate title for ResolverActivity