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

Change-Id: I89a29ae96322cfe9bfcb0d1f89c212fc7df30b4b