Merge "Fix bad RecyclerView issue" am: 47bcb7f2a7 am: 44f302af74

Change-Id: I6d457f6617a571ac0790b39fca3278f60b0f61c6