Merge "Do not rebase Resources with non RM impls" into rvc-dev am: a132d3b5e2

Change-Id: Ie02a2524c157dd3bd585d25eb5b3e00b1d7a42c9