Merge "Remove RecyclerView tests form pathmap" into lmp-mr1-ub-dev