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

Change-Id: I168fc9de808ce570451ebaa686a39339af0f39e1