vendor rr improvements

Change-Id: Id7d435be30aea920b5bd1795139637d46655712d