am 5b5f82b6: (-s ours) Merge change 21000 into donut

Merge commit '5b5f82b635697159aeca23ceb0ec9d692c5a04f0'

* commit '5b5f82b635697159aeca23ceb0ec9d692c5a04f0':
  Update the platform-version-codename