Merge change 21912 into eclair

* changes:
  Bump platform version to 4.