am 4d0b9aba: Merge "Fix clearApplicationUserData() to allow a null observer" into klp-dev

* commit '4d0b9abae70bdf9a083c3ff7c92088e47637c57a':
  Fix clearApplicationUserData() to allow a null observer