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

Change-Id: I30b4978a1ccdb000ea50c00a2400e1b9befee6d3