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

Change-Id: Id7dc24307e119abbda6463ef75a5bf8c3228dabe