Merge "Per-user content observer APIs" into jb-mr1-dev