Merge "Temporarily re-added addSavableIds() with AutoFillId."