am f2329e1c: Merge change 27333 into eclair

Merge commit 'f2329e1c1c56cdcf587e634811280c0358a61e61' into eclair-plus-aosp

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