am 2cbcd24b: Cherry-picked from e6b969f3b in master. Do not merge.

* commit '2cbcd24ba708be5e387b8bf54351f5c2df7abbec':
  Cherry-picked from e6b969f3b in master. Do not merge.