am 2e740944: Merge "Clearing some android list errors/warnings." into ub-now-queens

* commit '2e740944ed8660b8f28177172482f90d3afb7dcf':
  Clearing some android list errors/warnings.