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

* commit '376e93fcea19cd491af59631f3934ab036e1e846':
  Improving PictureListener deprecating comments