am 6d54f9f5: Merge "Fix the unintentional behavior change"

* commit '6d54f9f53cf7a82a0745b0c575cf11d63ec20746':
  Fix the unintentional behavior change