Merge "logpersist: missing X"
am: 420b64160c

* commit '420b64160c498900247314be78349654583a4455':
  logpersist: missing X