aosp-stable & x64-upstream: Better support of backup