Merge "Remove redundant createAdapter override." into tm-qpr-dev