Merge "Remove unused setter" into rvc-dev am: a26d6cd726

Change-Id: I5ad87c1730ea667470f2f3128dee9b0c6b6c1896