am 40d49a02: am e99e5474: Merge "Sync persist property immediately,in case of suddenly remove the battery."

* commit '40d49a02928e5b9a357915e0c73c764932a84f28':
  Sync persist property immediately,in case of suddenly remove the battery.