Merge "Fix RecyclerView resource path am: 43d0156 am: a6fb1e6" into nyc-mr1-dev-plus-aosp am: 529970a1d6
am: 55fac8f48d

Change-Id: Iaab1f1a421c014f27c81951d0bc37ca9857615e5