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

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