Merge changes I513b7234,Ie3d05fcf

* changes:
  cherry-pick of am 7cd40294: Merge change I2cb78a66 into eclair-mr2
  use a fixed value for public ID