Adding auto save function merging from android.