am 3097d0e1: (-s ours) am 6d24e086: Merge "Remove dead code."

* commit '3097d0e151b4f07552e987ee5819e9e7c6953a71':