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