am 65405378: Merge "Follow up 137982"

* commit '65405378f4fd207dcd7d99916c2397a0da08438f':
  Follow up 137982