Merge "Clearing some android list errors/warnings." into ub-now-queens