Follow up commit auto save function merging from android.