am 5a1695ae: am 37db663c: Merge "Remove dead code"

* commit '5a1695ae86cd6901d4bd825a85923d8e6a8056dd':
  Remove dead code