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

Change-Id: Iab4f5bfcf1a535063666fb7410fe940a07d3cbae