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

* commit '8a927cfa4ea8e4a78f6a9fa1e2b1da9187a3d1e8':
  Fix a bug introduced in change 73712