Merge "Fix ContentObserver unregister issue" am: 09b6988e27
am: 481d92c517

Change-Id: Icad1a472602443fe5a4931cf6181411e15b4c68f