am 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev

* commit '338a5a88fe8ecf8a724fcfaa2888a7c0fe53cb34':
  Add RecyclerView support.