am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.

* commit '0cc468dc2a1420d5c9dac563cc6c5d11b862ff47':
  Follow up to change b638126ed DO NOT MERGE.