am 6b1b24a0: am 0d2a1274: am a9d3960f: Merge "Fix synchronization in onNotNullableQueryComplete" into klp-dev

* commit '6b1b24a0190f756e1e27c09ca1e424e3c2a256e2':
  Fix synchronization in onNotNullableQueryComplete