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

* commit '529970a1d61dca77e25057335a2e7bb8c3dc9c11':

Change-Id: I7e30a23b3423617926b885682bb461f0d4d591d9