am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712"

* commit '136c02191790aa937c490341df49e966735f6857':
  Fix a bug introduced in change 73712