am 16422b25: Merge changes If241e329,Ib69b6987 into mnc-dev

* commit '16422b25f7a814be0c3ceba44a4e9e62b10427a5':
  Clarify docs on registerContentObserver.
  Add missing docs to StateSet.