am a3f7c20f: Merge change 21912 into eclair

Merge commit 'a3f7c20f907dca3e8de5664bf8c3e7dec4f0db05'

* commit 'a3f7c20f907dca3e8de5664bf8c3e7dec4f0db05':
  Bump platform version to 4.