am 554069ee: am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev

* commit '554069ee8c3a0c06d0849d198325eda9c0128097':
  Fix registerListener and flush bugs.