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

* commit 'c156021debb8e13324e451cb288da7edd7e112ca':
  Fix a bug introduced in change 73712