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

Change-Id: I43d6e4702fc3d1caec04321978af8c7351911bb5