am 6a20005e: Merge "Adapt to upstream changes."

* commit '6a20005e9cf115b450ff344c5b13b2efaf8c4b75':
  Adapt to upstream changes.