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

Change-Id: Ie5c7eaa5225266bff0f63f1a47f0ce6f18dce6ca