am 9c92ad31: am 2f25cb47: Merge "logpersist: Additional barrier"

* commit '9c92ad3125b251109c6537e45d147650756058ca':
  logpersist: Additional barrier