Merge \\"We should registerContentObserver with app\\'s user id\\" into nyc-mr1-dev am: 97fc17ce8e
am: 7572ca23bd

Change-Id: Id3b2b163a52579c58e9c843dd57e572f5bd75a74