am de740218: Merge "Follow up 129144"

* commit 'de7402182c1b020dec43aa38d62fa369a4ef52b8':
  Follow up 129144