am 7a1d29eb: am 1d8f780c: Merge "Fix misuse of my_sanitize_host."

* commit '7a1d29eb4bea37a4f043330cf722f720103129b8':
  Fix misuse of my_sanitize_host.