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

Change-Id: I5ef1a05d90938b6809f8256fd53fd1278b7b4c47