Merge "Remove dead code" into rvc-dev am: 497fa82bf5

Change-Id: I74e8dd5642842a50fe12136845bf275ee0acf1ce