am cb1fd7b9: am f2329e1c: Merge change 27333 into eclair

Merge commit 'cb1fd7b951b839e60d0f2ecbce44bee3da19cacc'

* commit 'cb1fd7b951b839e60d0f2ecbce44bee3da19cacc':
  convert id to full-selfattendance as well.