Merge "Fix unregistration of incorrect ContentsObserver" into pi-dev
am: c7f155b33e

Change-Id: I690be97a8b63720db67912c79eea6da5ff3412d1