am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1

* commit '7859c1842c1f2e3c43415dfb5337a0b005bdb1c4':
  Improving PictureListener deprecating comments