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

* commit '7ad2d5b4eda851dc1d890b0e135a7a3c3bdb41b5':
  Correctly populate title for ResolverActivity