am 68e77434: resolved conflicts for merge of 5aa3ce3a to mnc-dr-dev-plus-aosp

* commit '68e77434d8967baf7f1a5b79a61febcc60e6cb0a':
  udpater: Call fsync() after rename().