am 091cc082: am 442788eb: (-s ours) am 3e4eba6f: Merge "Backport cleanup to setAdapter. DO NOT MERGE." into klp-modular-dev

* commit '091cc0827997c4ad0a3037b28d13f0da1407a5ca':
  Backport cleanup to setAdapter. DO NOT MERGE.