Merge "logpersist: missing X" am: 420b64160c
am: bfb37ab6d8

* commit 'bfb37ab6d8788662ef1577222db9d3c9433d5f80':
  logpersist: missing X