am 4911f491: Cherry-picked from 4bdc7767e in master. Do not merge.

* commit '4911f49136da4eb540cbeb364c73ea30bff8277f':
  Cherry-picked from 4bdc7767e in master. Do not merge.