Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp * commit 'b83a283ac178ab0a72f1d811189d79b26097835e': docs: add dev guide for backup