Merge "Remove useless code" into rvc-dev am: 4505a1787d

Change-Id: I39a929d7bfc18cc25205eab65705c3840af3caed