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

Change-Id: I838990d16bc1c8f6613fad5e6c912c61345b348e