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

* commit '048b3eb0170b8816cd97400a43f7f1523c19c210':
  Fix misuse of my_sanitize_host.