am 55d69a96: am 032be7a4: Merge "Log an error if property pool is exhausted"

* commit '55d69a9681061b97d6bdcc0b1b92a7de63d0a07b':
  Log an error if property pool is exhausted